Treat unthemed icons the same as force_size for scaling

This is closer to what we were doing in the past.

diff --git a/gtk/gtkicontheme.c b/gtk/gtkicontheme.c
index 1d2efd446a78ff2c75acc7cc10a013ed52db51d6..ef07a845c2e3d49a76178f542a1cfb6479aceb60 100644 (file)
--- a/gtk/gtkicontheme.c
+++ b/gtk/gtkicontheme.c
@@ -3718,7 +3718,8 @@ icon_info_ensure_scale_and_pixbuf (GtkIconInfo *icon_info,
    * for the directory where the icon is; the image size doesn't
    * matter in that case.
    */
-  if (icon_info->forced_size)
+  if (icon_info->forced_size ||
+      icon_info->dir_type == ICON_THEME_DIR_UNTHEMED)
     icon_info->scale = -1;
   else if (icon_info->dir_type == ICON_THEME_DIR_FIXED ||
            icon_info->dir_type == ICON_THEME_DIR_THRESHOLD)